Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cn-6to5 #16

Closed
wants to merge 1 commit into from
Closed

cn-6to5 #16

wants to merge 1 commit into from

Conversation

hacke2
Copy link
Member

@hacke2 hacke2 commented Nov 5, 2014

No description provided.

@UltCombo
Copy link
Member

UltCombo commented Nov 5, 2014

@jaydson what do you think about changing the contributing guide a bit? I believe contributors could just send PRs against the src branch, and then you, I or another collaborator can update the master branch on our discretion. The main pros I see are:

  • Takes away the burden from collaborators of sending two PRs per contribution
  • Takes away the burden from us of reviewing the PR of the master branch
  • The master PRs can get outdated very fast, they become useless if we merge anything else in the src branch.

I believe we can just use the src branch as a regular repository (commit, merge PRs, etc.) and then update the master branch automatically based on the latest src commit. We can make a shell script or maybe a Grunt task for deploying. Perhaps even a CI/post-receive Git hook. This way we can cut down half of the "How to contribute" section as collaborators won't need to commit to the master branch anymore.

Thoughts?

@jaydson
Copy link
Contributor

jaydson commented Nov 5, 2014

Yep, agree.
Let's do it.
Please file an issue for changing the contributing guide.

About the Grunt task, we need to evolve Harmonic to support deployment.

@UltCombo
Copy link
Member

UltCombo commented Nov 5, 2014

@jaydson oh yes, right, we do have an issue open involving deployment in the Harmonic repository.

@UltCombo
Copy link
Member

UltCombo commented Nov 5, 2014

#17

@hacke2
Copy link
Member Author

hacke2 commented Nov 5, 2014

so I just PR md tothe src branch?

@hacke2
Copy link
Member Author

hacke2 commented Nov 6, 2014

Oh, I see , that is after the matter :)

@UltCombo
Copy link
Member

UltCombo commented Nov 6, 2014

so I just PR md tothe src branch?

Yes.

I've already accepted your other PR (#15) and merged it into 3434b7a, so you didn't have to open a new one. :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants